From: Katsumi Yamaoka <katsumi@flagship2>
Date: Fri, 4 Jun 2010 11:31:07 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~38
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e2bc36d8c2bc5143d5b598eff96ba48e545a372e;p=emacs.git

Merge from mainline.
---

e2bc36d8c2bc5143d5b598eff96ba48e545a372e